Only strip parentheses of the form (_x). (#434261, Brian Wellington)

2007-04-29  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores):
        Only strip parentheses of the form (_x).  (#434261,
        Brian Wellington)

svn path=/trunk/; revision=17705

diff --git a/ChangeLog b/ChangeLog
index e58c476722cd04b1417b8e737ccd26e092f8b759..16c10278ee01846bc64e4ff611f3e584b87e69ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): 
+       Only strip parentheses of the form (_x).  (#434261,
+       Brian Wellington)
+
 2007-04-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkprintoperation-unix.c

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 9fe1b841454a17d8ff44a13362ba19e1fd365ccf..7f19352e69e88573c75f2bdeeb75722fe3d41953 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -4922,7 +4922,8 @@ _gtk_toolbar_elide_underscores (const gchar *original)
       else
        {
          last_underscore = FALSE;
-         if (*p != '_' && original + 2 <= p && p + 1 <= end && p[-2] == '(' && p[1] == ')')
+         if (original + 2 <= p && p + 1 <= end && 
+              p[-2] == '(' && p[-1] == '_' && p[0] != '_' && p[1] == ')')
            {
              q--;
              *q = '\0';